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

Change-Id: Idf558d46f97e72d6f2056845390adb9e8ef13870