Merge "Add partial damage support to new draw path"