Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev