Merge "Fix keyguard state when primary bouncer shown on hub while dreaming" into main