am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener...
am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev
* commit 'f546eeb1':
DO NOT MERGE Reduce chance of notification listener dropped messages.