Revert: Allow applications to show the navigation bar in expanded desktop mode.

Breaks Nav Bar custom heights