BZ990295 - Navigation Bar - Project Explorer Updates
(cherry picked from commit 3ef3e5fc40e9e232441517f0949e157f6fc79975)