Merge "Call validateDisplay() when skipping frames" into oc-dev am: 949c9ce51a
am: 81f7a5c8fe

Change-Id: Ie3e99e8e7933008a5a7406edb37d389c70893886