Context switcher updates

See merge request !130095



Merged-by: Phillip Wells <pwells@gitlab.com>
Approved-by: Mark Florian <mflorian@gitlab.com>
Co-authored-by: Suzanne Selhorn <sselhorn@gitlab.com>