The default image style settings are not applied when Identifier and Type are different

Steps to reproduce

1. Go to Administer Wiki > Look & Feel > Image Styles
2. Create a new Image Style (e.g. 'Style1' - optional, choose some distinctive settings, like a specific Width/ Height, default Alignment: Center), the Identifier and Type must be different
3. From "Default Style" drop-down, select the newly created style (e.g. 'Style1')
4. Check (tick) 'Force Default Style' checkbox
5. Click "Update the default image style" button
6. Edit a page (e.g. Sandbox) with CKEditor
7. Click on 'Image' from toolbar
8. Select an image from Gallery tab
9. Click 'Select' button
10. Click "Insert" button

Expected results

The image is inserted using the chosen 'Style1' parameters (e.g. the specific Width/ Height, default Alignment: Center).

Actual results

The image is inserted with the default parameters (which I think corresponds to "---" selection) (e.g. Alignment: None, default size).

In order to apply the settings from the style, in the dialog drop-down another suggested style must be clicked and selected and then select (click) back the chosen style, then insert the image.

This is different than XWIKI-21621, where the image style was not getting selected by default in the dialog's drop-down.