Merge "Fixing various quickscrup controls for fallback activity" into ub-launcher3-edmonton