Merge "Implement close() for ControlBar" into pi-car-dev