Merge "Fix AppBarWithCollapsingToolbarTest in landscape mode." into nyc-support-24.1-dev