Merge "Avoid caching the ViewConfiguration"