Merge "Fixing UI issue to display preferred network type." into lmp-mr1-dev