Merge "Deal with unreliable VSYNC signals due to scheduler." into oc-mr1-dev