Merge "Making QuickScrub work, when the fallback activity is on top" into ub-launcher3-master