Merge "Send ChannelDialogController finish message on dismiss" into qt-r1-dev am: 0497a187 am: 2355b7f2 am: d1ba954f Change-Id: Ie4584682ae4b1f1ca07a50496c9531aabb373f7e