Merge tag 'v3.19-rc4' into next

Merge with mainline to bring in the latest thermal and other changes.