Merge "Animate thumbnail dim after quick scrub settles" into ub-launcher3-edmonton