Merge "Fix a crash in SystemUI when using CarNavigationBar." into nyc-dev