Update VisualEditor for cherry-pick

Change-Id: I92cb7bc442cf05ad31f75a7dae3580c4ee887ce1