Merge "Fix broken dark ui test" into qt-dev