Merge "Fixing Search box not getting aligned properly based on insets" into ub-launcher3-edmonton