Merge pull request #8488 from tinyredpanda/simplify-wstring-conversion Simplify wstring to QString conversion
