Redraw picking image in DrawMode. Re #6624.
Merge branch 'feature/6624_bug_masking_pixels' into develop