Merge "Verify that the screen is actually on for tests with turnScreenOnFlag"