Merge "Fix injected settings titles not matching a locale change." into oc-dev