Merge "Fix crash when rotating NFC dialog"