Merge "Fix crash in CarNavigationBarController." into nyc-dev