[Wallet] Watch-only fixes
Merge pull request #4937

ccca27a [Wallet] Watch-only fixes (Cozz Lovan)