Merge "Fix NPE in BeamDemo if NFC not present."