Update instances where SortCard was being used #705

Job	Run time
Linux-musl (x86_64-linux-musl)	1m 32s
Linux-musl-apicheck (x86_64-linux-musl)	1m 40s
Mac-os	1m 56s
Linux-musl (aarch64-linux-musl)	1m 37s
Android (21.4.7075529)	3m 4s
Android (16.1.4479499)	3m 26s
Mac-os-aarch64	1m 3s
Android (26.1.10909125)	2m 14s
Mac-os-aarch64-cctools	2m 13s
Mac-os-cctools	2m 11s
Windows	2m 12s
Mac-os-universal	17s
Mac-os-universal-cctools	6s
Notify-success	3s
	23m 34s

Provide feedback