Merge "Restore search UI layout to get search button back"