Merge commit '6cd80d738969e9398f763691bde4e240bff48074' * commit '6cd80d738969e9398f763691bde4e240bff48074': if the cursor and focus don't match, match them on text view clicks
Merge commit '6cd80d738969e9398f763691bde4e240bff48074' * commit '6cd80d738969e9398f763691bde4e240bff48074': if the cursor and focus don't match, match them on text view clicks