Merge "Change CacheManager to not flush and submit at end of trimMemory." into sc-dev