Merge "Add mixed transition handling for desktop changes" into main