Merge "Fix NPE when animation doesn't get started" into pi-dev