A quick fix for the regular iconPicker would be to add a flag on the request to only retrieve metadata when we need them.