Merge changes from topic "am-5db19ef1-44e7-4e3d-85ae-a8221cbff422" into ub-launcher3-master

* changes:
  [automerger] Animate thumbnail dim after quick scrub settles am: c879dbf764
  Animate thumbnail dim after quick scrub settles