Merge "2/ Fix flaky in WMShellFlickerTest legacySplitScreen tests"