Issue #3426374: Address feedback

Pablo Lópezrequested to merge
issue/navigation-3426575:3426575-shortcutsnavigationblock-tests into 1.x

Closes #3426575

Merge request reports