Integrated all recent changes that split WPEditorView from the VC.