Merge pull request #549 from Foundation-Devices/SFT-4185-fix-btcpay-a… #191

Job	Run time
Tools	2m 5s
Firmware (mono, -founders-passport, -founders)	3m 51s
Firmware (color, -passport)	3m 40s
Simulator (mono)	2m 59s
Bootloader (color)	2m 13s
Simulator (color)	3m 6s
	17m 54s

Provide feedback