Merge pull request #8260 from crdlc/bug-843832

Bug 843832 - [Homescreen] Tapping icons causes swipes [r=arcturus](cherry picked from commit 8983833fab75a3a580bb9909b610059138a52e18)
(cherry picked from commit dd294523f32061936709fa49a8578a6d968cb9f3)