Merge "Fix a bug with the screen incorrectly turning off on power button press." into main