Revert "remove lockscreen from merkbox"

This reverts commit 5fdab27beb6331cf562e706ed3818c78235e94c4.

Change-Id: I4aebac3144adf992e029c97d9afdb3d48a5c0da7