Merge changes I08c5006a,I6686b77c into qt-dev

* changes:
  Handle null OnSettingsClickListeners in ChannelDialogEditorController
  Close channel dialog when the guts go away