Merge commit '26d6e4704a9e514097ad88c04b29a4e8b325344f' * commit '26d6e4704a9e514097ad88c04b29a4e8b325344f': NFC Settings cleanup.
Merge commit '26d6e4704a9e514097ad88c04b29a4e8b325344f' * commit '26d6e4704a9e514097ad88c04b29a4e8b325344f': NFC Settings cleanup.