Merge changes from topic "am-d3d9c24b-dbc9-40e6-b12a-d4f1ff034e1e" into ub-launcher3-master

* changes:
  [automerger] Settling scrolls over clear-all button. am: a9283beebc
  Settling scrolls over clear-all button.