Fix a possible crash when the listener is null

Test: manual
Bug: 129930804
Change-Id: Id598ae1d98154b19d156e52973cf379669e7060c
Merged-In: I325fd3eda6e89228353342f00a49f50b22b17071
Merged-In: Id8151886ab1d26101e02f9abe9e21c58c7236623
(cherry picked from commit 28671455229a7a1b74b54fa183c6ba4cc225099f)
5 files changed