Merge "Fix WindowInsetsBehaviorTests failure" into sc-qpr1-dev