Merge "Allow making search and settings MenuItems via XML" into pi-car-dev