Merge "Change selection to use left/right instead of base/extent." into jb-dev