Merge changes I34983821,I175e4282 into main

* changes:
  Initial overflow compatibility with layout transition.
  Migrate layout transition flag to DesktopModeFlag version.