Merge "Ensure keyguard stays hidden when transitioning between hidden states." into main