Merge "Extend strings.xml character limits" into rvc-dev