Merge "String changes in the cross profile settings page" into rvc-dev