Merge "change how recovery animation is implemented"