Merge "Align the search view with the setting items" into pi-dev