Merge "Fix a car audio context bug." into nyc-car-dev