Fix bug 986480 - Only show search navigator UI when needed.
Merge pull request #2174 from jezdez/search-hide-unwanted-navigator-986480

Fix bug 986480 - Only show search navigator UI when needed.