am 26c00d5a: am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev

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