Merge "Add explicit method to dismiss Keyguard"