Update VisualEditor for cherry-pick of I346903

Change-Id: I15990a159a0b090d829b7f8b4de28418847e8b85