Sweeping !39051 from master to 21.2. SelectionHelpers: Fix use of dangling reference.

Atlas Nightlybuildrequested to merge
cherry-pick-946bac9e1de-21.2 into 21.2

SelectionHelpers: Fix use of dangling reference.

See merge request !39051 (merged)

Merge request reports