Merge "Enable device search" into sc-dev