Merge "Fix issue 4673378: switching from VoIP to GSM call"