Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev