Remove Empty menu. (see #12157)
Merge pull request #2254 from jburel/rebased/develop/view-menu

Remove Empty menu. (see #12157) (rebased onto develop)