Merge "Remove dependency on CarDrawerActivity."