Merge "Again, get sync() off UI thread"