Move client-side EditorRow inside Grid (#13334)

This is the first step in the planned API flattening.

Change-Id: I0127108b70131f328895dd8d7376c30b9a613464