Merge "Fix where post-disconnect CEP causes single party call mode to exit." into qt-dev