Merge "Caching external icons in LauncherModel"