Update VisualEditor for cherry-pick

Change-Id: I51e7a1b23922349e5be5b575d86456bfe0ff1258