Revert "Merge pull request #12086 from alivedise/bugzilla/905116_master_...

...v4_test/homescreen-launcher"

This reverts commit 3408cc3f6b190c8cd31832fbb8cd2ae571041f29, reversing
changes made to 41d0776a8745e93f4437111d1a09f483127db22c.