Merge "Add NavigationBarOverlayController."