Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev