- Fixed redraw behavior.
Merged.