Merge "Fix getSwitchState."