Merge "Update dirty-image-objects" into main