Merge pull request #10795 from crdlc/bug-890183

Bug 890183 - [Homescreen] Wrong focus is shown(cherry picked from commit cedd2d3c7c806d394fc03308ac836448522c5733)