Merge "Change ShellTransitionScenarioExtractor to TaggedScenarioExtractor for Desktop Windowing CORNER_RESIZE flicker test so that it collects the relevant jank traces during resizing and reduce flakiness." into main