Merge "Fix NPE in DisplayPowerController." into sc-dev