Revert"Base: Force show navigation bar (1/2)"