rework screen on/off code

Change-Id: I13f71e850592a588bbd4805b1830c503bd4decb4
4 files changed