Merge "Various quickscrub fixes" into ub-launcher3-edmonton