Merge "Revert "Subscription selection when dialing USSD""