Merge "Make connection events work for conferences" into qt-dev am: 0427b5cef7
am: 6fbefd2494

Change-Id: Idcb1d658d2831597b80a724676e159417ee33d85