Merge "Merge "Fix CollapsingToolbarBaseFragment crash on R." into sc-dev am: ab3f5195 am: 8e19405d" into sc-v2-dev-plus-aosp