Merge "Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev am: a4b6b9d265" into oc-mr1-dev-plus-aosp