Merge "Allow making search and settings MenuItems via XML" into pi-car-dev am: 7e73f9ebab

Change-Id: I82efe97b6e048c2904552e54b3acad1dc1b0d177