Merge "Update NavigationBarOverlayController interface." into sc-dev