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

Change-Id: I50c1c96e0f7fe7fb0fb0dba64da28ceb9955013a