Merge "Removed screen on/off callbacks from NPMS."