Merge "Add setting to disable animations"