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

Change-Id: Id8151886ab1d26101e02f9abe9e21c58c7236623