Work on Aqua UI some more. Reworked the Merge window a little so that the frames are properly configurable.
Authored by: dorothyr 2018-05-31
Parent: [r112]
Child: [r114]
