Merge pull request #7863 from crdlc/bug-836023

Bug 836023 - Click events on desktop homescreen are ignored [r=arcturus]
Merge pull request #7923 from crdlc/bug-836023-2-v1-train

Merge pull request #7863 from crdlc/bug-836023