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

Change-Id: I68a104278a20bfea0f1881a75fd9cfe7b9c00095