Merge "Scale the leash for expand/collpase PiP transition" into rvc-dev am: 69d1cdf903

Change-Id: I5d10988fb4b5065a2c8aa326ed57ca153ba914bc