Merge "TeleService: use subId as requestCode to send the selection intent" into main