Integrates the latest editor changes.

Fixes [this](https://github.com/wordpress-mobile/WordPress-iOS-Editor/issues/214) and [this](https://github.com/wordpress-mobile/WordPress-iOS-Editor/issues/162) ticket.

PRs already reviewed in the editor pod.