Merge "Animate ranges and toggles" into rvc-dev am: 75c2e16120 am: 766b0eb76b

Change-Id: Ic61e061277316f80fbd87927716ce6ec025e5101