Merge "Require mutator lock for DeleteLocalRef" into mnc-dev