Merge "Make Settings and SysUI estimates use same data class" into qt-dev