Merge "Fix Dark theme case" into qt-dev