Merge "Align fallback result query with result text" into ub-launcher3-master