Merge "Cancel the stash animation if the stash controller is destroyed before then" into main