Merge "Send ChannelDialogController finish message on dismiss" into qt-r1-dev am: 0497a18767
am: f2a72eec27

Change-Id: I6a59fb33aa9ff25f1daff2eb2a3e7cede9fbc24c