Merge "Change animation-leash to be a container layer" into rvc-dev am: a666d80531

Change-Id: I5ca34ef22f381aa83e5da0231dc9c08b9266e5e0