Merge "Add C++ bindings for Keystore flags" into main