Merge changes from topic "am-134d7b95-8105-45a9-85e3-e09b130a0ac1" into ub-launcher3-master

* changes:
  [automerger] Add a quick scrub threshold am: cf563e5f2d
  Add a quick scrub threshold