MPS-20265 Failing Merge causes UI deadlock
Merge remote-tracking branch 'origin/MPS3.1'

Conflicts:
	plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/Info.plist.xml