Merge "Make sure we sync() after finishing server-commanded deletion"