Merge "Wait for DB to reflect group UUID updates"