Merge "Selected count string needs plurals." into mnc-dev