Merge "Actually change api to use long in CollapsingToolbarLayout." into nyc-dev