Merge "Revert "Mark Desktop Windowing transitions flags as BUGFIX"" into main