Merge "Remove dead TrustListeners"