Merge "Animate ranges and toggles" into rvc-dev am: 75c2e16120 am: 8bddaff99f

Change-Id: I595d6f2e5ed53a42f1038bfb2861bdb276027a1c