Merge "Remove failsafe runnable once the animation finishes." into pi-dev