Merge "Thermal shutdown fix: cool down on writing to disk" into pi-dev