Update VisualEditor for cherry-pick of I6333590e4

Change-Id: I67da7d787962739ca1d87cb4582b9267f08c2201