Merge "Remove the getSwitch() in SwitchWidgetController"