Merge "[Keystore] Use Strict for every call into keystore" into main