Merge "Fix various AppBarLayout restoration bugs" into nyc-support-25.2-dev