Revert "Revert "merge focus and translation fixes""#230

marcpems merged 1 commit intomainLinaro/works-on-woa:mainfrom

revert-229-revert-227-stagingLinaro/works-on-woa:revert-229-revert-227-stagingCopy head branch name to clipboard