Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev