cocoa: show modal dialogs in window where action is initiated
Merge remote-tracking branch: upstream/master