Merge "Fix 5266335: bad DIRTY/invalidation logic"