Merge "Create a new icon cache mechanism for memory improvement"