Merge "Fix getSwitchState." into honeycomb