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

Change-Id: If81a3f68da4f8e9ac585e7e1cdc7b1fdc8421304