Merge "Fix switches missing from switch preference in PaintBooth" into pi-car-dev