Merge "Dismiss keyguard when opening settings"