Integrates the latest editor pod improvements.

Integrates the latest fixes from the editor pod.

/cc @bummytime