Merge "Fix CollapsingToolbarLayout tests" into nyc-support-24.1-dev