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

Change-Id: I78bbbfbac2bf9249be3509ac0021d5f869c89f7b