Merge "Fix NPE when animation doesn't get started" into pi-dev am: 8b881b29bf
am: b5eff77b0b

Change-Id: I2407a1f95ef48ef071be2964df128d048304ed44