Merge "Always set switch state following drag"