Fix repainting of toolbar separators after non-client area has been painted.
Fixes #4114 and #2994