Merge "API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS."