Merge "Fix issue where redial connection change is notified on wrong phone." into sc-dev