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

Change-Id: I1b5517489afa3da6c767bea99122a7c7fa05c3a1