Merge "Fix CollapsingToolbarLayout scrim not being drawn" into nyc-support-25.1-dev