Merge "Add a flag to enable watchdog for the NFC system process" into main