Merge "Ensure taps are capture for falsing in the Wallet Activity." into sc-dev