Merge "Tighten up pending animations list." into pi-dev am: 80e87e4d2d
am: f0bda17a3f

Change-Id: Ida2146ac2dbca4051747f2f96717ca7069022d4b