Merge "Add a 10s timeout to DumpstateBoard" into pi-dev