NavBar fix kill app

Change-Id: I4a89a82d72cc0dfaeda14ecbdc9df10f5c53bdcb