Merge "Allow quick scrub/switch from minus one" into ub-launcher3-master