Merge "Tweak AppBarLayout elevation changes" into nyc-support-24.1-dev