Merge "Fix flaky InsetsStateControllerTest"