Merge "Fix dark mode NPE" into qt-dev