Merge "Tag-mismatch in nfc_enabled" into rvc-qpr-dev