Merge "SwitchManager: getSwitchState() should not return null"