Integrated the latest editor pod changes.

Integrates the latest editor pod changes.

/cc @sendhil