Merge "Add flag for NFC associated role services" into main