Revert "Revert (manually revert) "Bug 933035 - [B2G][System][Lockscreen] The"

This reverts commit 86ff94b32e369a925b79ae16ced141c1ac36fc0e.

After confirmed this backout didn't help the bug,
I now reland the code back, and to see if it can solve the other bug
may cause by it (Bug 993281)