Merge "Call validateDisplay() when skipping frames" into oc-dev