Merge "Add new flag for ring-my-car feature." into main