Merge "fix failure during connecting device when channelActive happens later than...