Integrates the latest editor bugfixes.

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