Merge "Don't merge keyguard and unfold transitions" into main