* commit '26c00d5a4bdbdcdbefe7f5d7e3ce34d92382bbc0': Reduce chance of notification listener dropped messages.