Merge "Revert "fetch and update shortcut icons in background thread"" into ub-launcher3-master