Updating for 2.1.2 release including ToggleSwitch fix.