Merge "Fix mobile data settings UI bug." into oc-mr1-dev