Merge "Update String resources used for buttons in EditUserInfoController" into main