Use same options for VisualEditor and Editor overlays

Make this more future proof.

Bug: 65587
Change-Id: Ibf37aa443e2961e37050f45ac377e4580dd54892
Merge "Use same options for VisualEditor and Editor overlays"