Merge "Add config flag to enable/disable nav bar auto dim"