Merge "Clear mPendingScreenOff and stop color fade animiation if screen is on" into nyc-dev