Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev