Merge "add null guards around notification listener handlers"