Issue #3204778: Fix coding standard issues

Tom Keitelrequested to merge
issue/view_mode_switch-3204778:3204778-fix-coding-standard into 8.x-1.x

Merge request reports