Update VisualEditor for cherry-pick

Change-Id: I05fbf86a4a29218014c1485f8c76b8156372118f