Merge changes from topic "am-9239a189-c8cc-4be8-80fd-2bbc9762a6de" into ub-launcher3-master

* changes:
  [automerger] Fixing Search box not getting aligned properly based on insets am: df296898da
  Fixing Search box not getting aligned properly based on insets