Merge "Don't reset the keyguard if it's going away." into sc-v2-dev