Merge "[Sim UI enhancement] MobileNetworkSettings UI enhancement" into main