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

* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error