Merge "Change name of NetworkScorerPicker."