Merge "DevelopmentSettings: Remove redundant CacheType overrides"