Merge "Fix another animation leak" into pi-dev