Revert "Revert "remove lockscreen from merkbox""

This reverts commit f7c5463be76872bb4cbfb4b09dd0521098f01d5e.

Change-Id: I79f682e967274d23c87f305b814a690ce3fdfda1