Merge "Fix AppBarLayout elevation jump on API 21-23" into nyc-support-25.2-dev