Merge "Remove deprecated NFC beam support"