Merge branch 'develop' into bs/fixed_grouping

CHANGELOG.md

@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed the tasks view (infinite loading) when it is impossible to get a preview of the task (<https://github.com/openvinotoolkit/cvat/pull/2504>)
 - Empty frames navigation (<https://github.com/openvinotoolkit/cvat/pull/2505>)
 - Disabled position editing in AAM (<https://github.com/openvinotoolkit/cvat/pull/2506>)
+- TypeError: Cannot read property 'toString' of undefined (<https://github.com/openvinotoolkit/cvat/pull/2517>)
 - Extra shapes are drawn after Esc, or G pressed while drawing a region in grouping (<https://github.com/openvinotoolkit/cvat/pull/2507>)
 
 ### Security

cvat-ui/src/actions/annotation-actions.ts

@@ -520,13 +520,13 @@ export function removeObjectAsync(sessionInstance: any, objectState: any, force:
                     },
                 });
             } else {
-                throw new Error('Could not remove the object. Is it locked?');
+                throw new Error('Could not remove the locked object');
             }
         } catch (error) {
             dispatch({
                 type: AnnotationActionTypes.REMOVE_OBJECT_FAILED,
                 payload: {
-                    objectState,
+                    error,
                 },
             });
         }