[Wallet] Do not flush the wallet in AddToWalletIfInvolvingMe(..)
Merge branch '4805'