Keep viewtype consistent for addons
Merge pull request #4121 from Black09/fixes

Keep viewtype consistent for addons and remove view flickering on add-on launch
Fix CNFSFile test compile

Let's deep grep next time we rename headers!
Fix compile of CharsetConverter tests.