Merge "Fix the list of PROCESS_TEXT items in the toolbar."