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

Change-Id: Ie089ed63df8064798fa98a8a2378b81d09cf3b1c