Merge changes from topic "am-0087df7e-ff8b-487b-846d-9dc2f096ec07" into ub-launcher3-master

* changes:
  [automerger] Gracefully handle some edge cases in quick scrub am: f47e5ce3cf
  Gracefully handle some edge cases in quick scrub