fixed PY-8567 Unwrap/Remove action is not avalable with caret/selection at the very end of the statement
Cleanup
Merge remote-tracking branch 'origin/master'