Merge "Revert "DispSync: workaround HH hardware vsync issue"" into nyc-dev