Merge "Consider swipes on the unlock icon as intent for device entry" into sc-dev