Merge "SF: remove dont_skip_on_early_ro2" into main