Merge "Scale the leash for expand/collpase PiP transition" into rvc-dev