fix up merge issues

This also includes a partial revert in DisplayPowerController
to solve screen not turning off issue