Update VisualEditor for cherry-picks

Change-Id: Ib711730879ab3bb053d240aac5198bab459c5c6f