Merge "Make DelegateManager thread safe" into mnc-dev