Merge "Add flag for desktop windowing enter transitions" into main