Merge "Correct issues with answer/unhold call auto-disconnect." into qt-dev