Merge "DispSync: Don't resync if HW vsync is unavailable" into nyc-dev