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