Update VisualEditor for cherry-pick

Change-Id: I5c587cab01628fc206493cf3c5c725e452f15c3c