Merge "Fix NFC state switched off every time user entered connection preferences page"