Merge "[Mobile] Add SPN to network name calculation" into main