LockScreen Fix

Change-Id: I3e1e850408c44fc0f77d99056b98a6a07c0365a5