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

Change-Id: I50c75d04df75bc81b60954e74c47eea39ca516ef