Don't show scroll bars on selected merge cells
Add merge test config
Improve progress window handling
Show progress window during combining