tests fixed
Merge remote-tracking branch 'origin/8.86_brushpicker_dialog_redesign' into 8.86_brushpicker_dialog_redesign