Bug fix: Turn NFC ON/OFF requires a reboot.

Change-Id: Ib15b1b4fe9479e395bd11c46eaf02ac04e67a48c