Merge "Fix dark theme and battery saver interaction" into qt-dev