task: #3624999 Stop locking display override field

Pierre Dureaurequested to merge
issue/display_builder-3624999:3624999-stop-locking-display into 1.0.x

Closes #3624999

Merge request reports