Resolve #3576178 "Layout builder usage revision fix"

dpirequested to merge
issue/entity_usage-3576178:3576178-layout-builder-usage-revision-fix into 8.x-2.x

Closes #3576178

Merge request reports