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