Merge "Update strings and character limits for some new strings"