Update VisualEditor for cherry-picks I54602394e & I3b58ce0f4

Change-Id: I4b3a043fb271ed436d00897721b41fcd1d02af82