Update VisualEditor for cherry-picks

Change-Id: I8f8b63c75b2d1820da0293e827c0c3592ddb93fb