Merge "Make CollapsingToolbarBaseActivity extend FragmentActivity" into sc-dev