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

Change-Id: I2943eecbc6fbfa31d03349d14ec97040b08aca8e