Merge "Extend strings.xml character limits"