New thermal imported from @Dorimanx branch and adjusted for I9505.
Revert "New thermal imported from @Dorimanx branch and adjusted for I9505."

This reverts commit efd8a6c7e75d2803c94c36815c084a2e38e8ed0b.