Merge "Defer display switch update if transition is running" into main