Merge "Dismiss keyguard when user button is tapped" into nyc-dev