Merge "An update on dirty rect invalidates"