Double appearance of "Current unstaged changes" fixed. Closes #2407