Merge "Remove empty_search_image from Settings." into pi-dev