Imported the latest fixed to WPEditorView.