Issue #3204780: Fix deprecation warnings

Tom Keitelrequested to merge
issue/view_mode_switch-3204780:3204780-8.x into 8.x-1.x

Merge request reports