Merge "Refactor another network mode preference"