Conflicts: src/libs/extensionsystem/pluginview.cpp Change-Id: I316199fe0a257cb085668ccb183b1590555278f2