Merge "Add separate category header string for clone accounts" into udc-dev