LockScreen Fix

Change-Id: I6c0168f62d91f0c84074008e2790b380a5f8b1a0