Merge "Refine condition for starting window skip" into oc-dr1-dev