Merge "Require mutator lock for DeleteLocalRef"