Merge "Ensure non-ringing call doesn't start ringing." into qt-dev