Merge "Fix editing ended event API" into main