Merge "[flexiglass] Support for delayed locking" into main