Merge "Only clear the caret when in caret selection mode." into jb-dev