Merge "Moving some utility class to IconCache to make it easier to use outside Launcher" into main