Merge "Fix search box sometimes not losing focus" into pi-car-dev