Update VisualEditor for cherry-picks of If67fe35b and I80d0632fd

Change-Id: I59c034b2edee95be8c1db464267c78ccbce2873f