Merge "[Settings] MobileNetworkActivity Refactor"