Merge "Animation settings reset to default"