Merge "Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8 am: cf538b382a" into oc-mr1-dev-plus-aosp