Merge "Deal with unreliable VSYNC signals due to scheduler." into oc-mr1-dev am: d3da615084
am: 95d4273eae

Change-Id: I889ec09ae89e3a3b2ac176079d4684a955ba5333