Merge "Use the full locale list in resourceQualifierString()."