Merge "Distinguish internal and external web suggestion queries" into froyo-ub-qsb