Merge "Back porting Dark theme bug fixes from R" into qt-qpr1-dev