Merge "Fix a couple quickscrub issues" into ub-launcher3-master