Merge "Add getNavigationBarWindow override to CarStatusBar"