Merge "Keystore VTS for module hash" into main