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

Change-Id: I71e68c3b12d7dbe32f2c3742ce218c88ec3e370a