Merge "Fix a possible crash when the listener is null" into qt-dev