Merge "Don't animate grayscale if animations are off" into oc-dr1-dev