Merge "Support resetting "smart selection" to any word in the selection." into oc-dev