Revert "Fix: Custom lockscreen force close"

This reverts commit 6af4b210145c34c0249ef703b8ba33f0ed4ca6e8.

Change-Id: Ia5956d70bbc8a98d141ff64e11a575e410d99952
Merge "Revert "Fix: Custom lockscreen force close"" into kitkat