remove lockscreen from merkbox

Change-Id: I49620eabbd7392f2ab5c0f3699578209bba1a6b5