Merge "Deprecate view drawing cache"