Merge "Remove no longer needed workaround for new devices that previously" into pi-dev