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

Change-Id: I9147082d4776b451b487c74785af9df9e2590ca3