Merge "Add equality to DrawableIcon" into main