Merge "Move IconCache to SettingsLib(I)."