Merge "Fix incorrect "listener no longer active" errors"