Merge "Add GarageMode settings." into nyc-car-dev