Merge "Don't force nav bar shown if configured" into tm-dev