Merge "Fix dangling pointer issue in LocalUpdatbleMaps" into rvc-dev