am 48b3f56c: Merge commit \'95a7829c\' into manualmerge

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