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

Change-Id: Ia7c5f062b34475630817fefe5fc7ab68f4e0cdaf