Merge "[BBQ] Only wait when acquiring a buffer if in a sync."