Merge "Latest UX for Tap & pay." into klp-dev