Merge "Replace "display name in review category" preference with a list of options"