Merge "Dismiss keyguard when user button is tapped"