Merge "Improvements around CollapsingToolbarLayout's scrims" into mnc-ub-dev