Merge "Fix setting state description of toggle button and switch"