Merge changes from topic "am-85c4a06c-b495-4e8b-9fa0-1fa07db12132" into ub-launcher3-master

* changes:
  [automerger] Bound overscroll shift amount to avoid content from drawing on top (Y-val) of the QSB. am: 5916709219
  Bound overscroll shift amount to avoid content from drawing on top (Y-val) of the QSB.