Fix command line processing on primary instance
Do not close main window on escape
Make setting enable-close-note-on-escape work

Fixes Bug 720748.