app: make GimpImageMap merge the filter before removing it from the drawable

This is a prerequisite for making it use cached results; not quite
there yet.