Merge "VID: Remove VID_KEYSTORE_PASSWORD workaround"