am b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev

* commit 'b78dc69c2be43852dcd7150db2b545f9b4110232':
  DO NOT MERGE: Maintain binding to crashed listeners.