Merge "Revert "Revert "Enable device search""" into sc-dev