Merge "Remove listeners on dispose to prevent memory leaks."