Merge "Fix for incorrect display of preferred network type on UI"