Merge "Switch widget: Fix ON/OFF option update error"