Merge "Mark screen rotation as early (1/2)"