Merge "Fix minor Telephony crashes" into main