Merge "Assign leash layer when starting animations." into pi-dev