Merge "Don't ever disable the status/nav bar." into klp-dev