A change to allow the Workbench context service to calculate active
contexts, and then have it update the EContextService correctly.  The
old way sometimes removed a context too eagerly.

Bug: 366606