Merge "Keep device awake when using keyboard" into main