Merge "ContextMap: Remove connection references when an app is removed"