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