MDL-38171 editpdf: Split colour picker in to comments/annotations