Merge "Update Search UI" into ub-launcher3-master