Merge "Fix thermal throttling atoms" into qt-dev