Merge "Restore the style of the screen saver widget from switch style to button style." into sc-v2-dev