Merge "Clear mPendingScreenOff and stop color fade animiation if screen is on"...
Merge "Clear mPendingScreenOff and stop color fade animiation if screen is on" into nyc-dev am: a02f1685
am: c68c5074
* commit 'c68c5074':
Clear mPendingScreenOff and stop color fade animiation if screen is on