Merge "Fix cached app icon being used in app list."