BZ990295 - Navigation Bar - Project Explorer Updates
(cherry picked from commit 0479aa31e3b5425127db9f3b9266f97584b5f3af)