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