Merge "Fix TODO for mobile network settings"