Merge "Listen to changes in the original connection for domain tracking"