Gallery picker frustrating

The gallery picker in the CKEditor is very frustrating.

I've been trying to insert an image in a CKEditor field, in the Content blocks field of a documentation document. I'm noticing the following:

1. Create a new documentation document or start editing an existing one
2. Click the image button in a CKEditor of a content block, to bring up the gallery picker
3. From within the gallery picker dialog, upload a new image
4. Select the uploaded image and press 'ok'. Do not select anything in the 'Align' and 'Size' drop downs
5. Save the document

The image will 'sit' nicely among your text and show as a thumbnail in your CKEditor field. The image has proper alignment and size.

6. Add another image to the CKEditor field, but this time open the gallery picker and choose an existing image.

Problem: when the image exists already, you are forced to select image variant. This is not the case for when you have just uploaded the image. Problem is, you have to know which variant is the right one. You can work around this only by comparing with other images in other CKEditor fields. But if you don't want to select one, you can't.

Second problem: if you ever chose a value from the 'Align' drop down in the gallery picker dialog, then you can never revert to the "Choose one" value. And trying to find which value is the right one by looking at images in other CKEditor fields, won't work in this case, the drop down there says "Choose one"