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