Merge "TRON: Smart selection events that don't change the selection." into oc-dev