Merge "Dismiss keyguard when simpin auth'd and..." into sc-dev