Merge "Fix emergency callback number not shown for incoming calls." into m-wireless-dev