Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev