Merge "Dark theme settings activity" into qt-qpr1-dev