Merge "Improve NFC availability for active UIDs"