Conflicts: src/plugins/coreplugin/mainwindow.cpp Change-Id: I975a4208588d174ebb44054de56c5ac8d7c878fe