Merge "Correct behavior answering incoming call with dialing self-managed call." into qt-dev