Update VisualEditor for cherry-picks

Change-Id: Ibaf0cc823bfe0a2de73e5641e06d059b52eeb915