Merge "rework screen on/off code"