Merge "Preventing unnecessary layouts on search focus change" into ub-launcher3-calgary