Merge "Added NFC disable during phone shutdown"