Merge "Set SPI Allocation Timeout to One Hour" into pi-dev