Show merge conflict indicator on the changelist's badge

[davidavetyan]

Currently, when a file has a merge conflict after syncing, a red circle appears for that file: However, when there are a lot of files in a changelist, or the changelist's tree item is collapsed, it's impossible to tell if there is a merge conflict without manually scrolling through all the files.

Please add an indicator on the changelist's badge itself, to show that there's at least one file in it that has a merge conflict.