Merge "Use new enableDesktopWindowingEnterTransitions flag" into main