Merge "DispSync: Actually wait forever" into nyc-dev