More keychain fixes #2441

Job	Run time
Check for Max SDK	7s
linux-x64-internal-release	12m 9s
linux-x64-internal-debug	10m 40s
linux-x64-external-release	10m 5s
macos-x64-internal-release	19m 57s
macos-x64-internal-debug	19m 35s
macos-x64-external-release	16m 37s
windows-x86-internal-release	17m 14s
maxplugin-${{ matrix.cfg.str }}-${{ matrix.cfg.sdk-version }}	0s
windows-x86-internal-debug	18m 28s
windows-x86-external-release	20m 45s
windows-x64-internal-release	16m 30s
windows-x64-internal-debug	13m 44s
windows-x64-external-release	15m 38s
	3h 11m 29s

Provide feedback