Merge "Remove quick switch and improve quick scrub" into ub-launcher3-master