Merge "Add flag for nfc card detection" into main