Merge "NFC Settings cleanup." into gingerbread