Merge "Fix UiAutomationTest#testWindowAnimationFrameStats." into lmp-sprout-dev