Merge "add shutdown animation"