Merge "Fix crash when doing conferencing over Wi-Fi" into mnc-dev