Merge "Add defroster fan positions" into nyc-dev