Merge "New look for query editing" into froyo-ub-qsb