Merge "Merge "Fix null pointer when mColorFadeEnabled is false" into...
Merge "Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev am: a4b6b9d2" into oc-mr1-dev-plus-aosp
am: 88b7016a
Change-Id: Ic01e859088dbfe6f30b8530b459e701b0d5255b5