Merge "Wallet view UI tweaks." into sc-dev