Merge "Fix UI field name for 'edit' button on review comments"