Corrected issue with switchable nav bar in status bar.
And some clean-ups

Change-Id: Ib9e1fb0bb93331f5ed8c05e94957fd68dc9f4420