Merge "Fix loading of the default animation settings"