Merge "init: increase thermal shutdown timeout to 3s" into pi-dev