Merge "Fix WMShellFlickerTestsDesktopMode SnapResizeAppWindow" into main