Merge "Offset dirty rect for surface insets correctly."