Merge "Prevent Hotseat jank when switching Fixed Landscape setting" into main