Merge "Add an intent action for Non-payment NFC services settings" into main