Merge "Apply Dark theme changes when screen off only" into qt-qpr1-dev