Merge "Bug fix for QuickAccessWallet." into sc-dev