Merge "Fix tap & pay strings." into mnc-dev