Merge "Fix issue with app launch from CarNavigationBar." into nyc-dev