Merge "Simplifying IconCache access code" into ub-launcher3-master