Redraw picking image in DrawMode. Re #6624.
Merge remote-tracking branch 'origin/feature/6624_bug_masking_pixels'