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

            // contents of the screen.

            mPowerState.prepareColorFade(mContext,

                    mColorFadeFadesConfig ? ColorFade.MODE_FADE : ColorFade.MODE_WARM_UP);

            if (mColorFadeOffAnimator != null) {

                mColorFadeOffAnimator.end();

            }

            // Some display hardware will blank itself on the transition between doze and non-doze

            // but still on display states. In this case we want to report to policy that the

            // display has turned off so it can prepare the appropriate power on animation, but we