Merge "Fix issue with animations that couldn't be started" into pi-dev