Handle the keep-screen-on more properly.

Change-Id: Iec16b1975537f69230d1c8ac19a5b0ff5a75d861
2 files changed