Merge "Improvements to power manager turning on screen."