Merge "Fix public issue #18054: USSD in-call toast"