Merge "Removed screen on/off callbacks from NPMS." into nyc-mr1-dev