Merge "Removing workarounds for a fixed bug" into ub-launcher3-master