Merge "Assert keyguard gone at beginning and end of PortraitLandscapeRunner" into main