Merge "Don't show default payment component in search if Wallet role is enabled" into main