Clean up nav bar logic from StatusBar

Bug: 143725341
Test: manual
Change-Id: Iaceff2ba8299273653982411932bf9b8583114c6
8 files changed