Integrated the latest from the editor pod.
Merge pull request #2714 from wordpress-mobile/editor-integrate-latest

Integrated the latest from the editor pod.