Merge "[framework] Add a flag for nfc persist log." into main