Merge "Making LauncherIcons thread safe" into ub-launcher3-master