Merge "Reduce chance of notification listener dropped messages." into lmp-dev