Merge "Ensure AIMapper and underlying IMPL outlive IMapperProvider" into main