Merge "Tighten up pending animations list." into pi-dev