Merge "Assign leash layer when starting animations." into pi-dev
am: 540a2903cd

Change-Id: Ic296e9aa0045eb69c80934ee6c3f28cf02c4204c