update NFC & unit display
Merge remote-tracking branch 'origin/SANY' into SANY