Merge "Fix early firing when adding event listeners" into qt-dev