Improve gallery picker code

Merged armin requested to merge improveGalleryPickerCode into master

Merge request reports