Merge "Revert "Turn the screen on so that test doesn't timeout waiting for window focus."" into pi-dev