Merge "DispSync: workaround HH hardware vsync issue"