Restricted the workaround key to only cases where we aren't creating a
fresh wallet.
Fixed rescan bug with multiple top-level wallets.