Merge "SF: Move DispSyncSource to STL plus thread safety annotations"