Merge change 2930

* changes:
  Add support for toggling DOM Storage support on and off.