Merge "Separate QSB from on device search"