FLUID-4962: Adds focus style to contrast theme choices, and themes the focus for this and on/off switches
Merge remote-tracking branch 'heidiv/FLUID-4962' into demo

* heidiv/FLUID-4962:
  FLUID-4962: Adds focus style to contrast theme choices, and themes the focus for this and on/off switches
FLUID-4961: merging with demo code.