Merge "Simplifying/fixing logic for ignoring touches in quick scrub" into ub-launcher3-master