Merge "Refactor nfc preference controller"