Merge "Refactor nfc preference controller" into pi-dev