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

Change-Id: I325fd3eda6e89228353342f00a49f50b22b17071