Merge "Skip handling input while the user is still locked"