Merge "Fix up Tap and Pay how it works." into mnc-dev