Merge "Writing tools: API for EditorInfo 2/n" into main