Merge "Don't destroy surface if there is no active animation to cancel"