Merge "Increase length of string for pref title" into oc-dr1-dev