Revert "Merge pull request #20939 from nullaus/bug1027414"

This reverts commit 217b6fac31a8eaa1f74dfff95239fbc29eae4dd4, reversing
changes made to f99a96a063f7569c3ba4921757b48e0e303884f1.
Bug 1027414 - [Smart Collection] getting the lockscreen on the geolocation notification for vertical homescreen can return to a black screen. r=alive
Merge pull request #21037 from vingtetun/backout-bug1027416-reland

Backout bug1027416 reland