Merge "Fix invalidation of transformed, opaque views"