Merge "Alienating QSB" into ub-launcher3-master