Merge "Fix Phone selection logic when ESIMs are involved"