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

Change-Id: Ie938321651725bd7c100c6efd973bf71aa5cbf0b