Merge "String and UI tweaks for "Mobile network"." into oc-mr1-dev