Merge "Move IconCache to SettingsLib(II)."