Merge "Fix connection state broadcasts"