Android Studio Git Tool shows wrong file types

After updating Android Studio to version 4.1, Git Tool now shows all my kotlin and xml files as C++ files.

I have attached a screenshot of the same.

Any idea how to fix this or is it a bug in new version??