Merge "Wallet screen UI Polish:" into sc-dev