Merge "Revert "Revert "Adding a separate state for QuickScrub""" into ub-launcher3-master