Merge "Fix tests that require the screen to be on."