am 3c814072: Merge "Only clear the caret when in caret selection mode." into jb-dev

* commit '3c8140723f67b63163ed1a3d6b0569ecbe46068c':
  Only clear the caret when in caret selection mode.