More keychain fixes #2435

Job	Run time
linux-x64-internal-release	31m 56s
macos-x64-internal-release	34m 34s
Check for Max SDK	1s
linux-x64-internal-debug	31m 44s
macos-x64-internal-debug	46m 36s
linux-x64-external-release	40m 54s
macos-x64-external-release	58m 5s
windows-x86-internal-release	59m 45s
windows-x86-internal-debug	1h 9m 56s
maxplugin-${{ matrix.cfg.str }}-${{ matrix.cfg.sdk-version }}	0s
windows-x86-external-release	1h 13m 4s
windows-x64-internal-release	1h 0m 15s
windows-x64-internal-debug	1h 4m 58s
windows-x64-external-release	1h 0m 18s
	10h 32m 6s

Provide feedback