Merge "Wallet affordance - Fix taps" into sc-dev