Update VisualEditor for cherry-pick

New changes:
1966a8a Followup 6d21d83: unbreak switching to edit source

Change-Id: Ifed227661ea10eb6b147c617e24ad0410180efd7