Merge "Detach the nav bar from the app when going home" into main