Merge "Make DISPLAY_SEARCH_RESULT_SMALL not badged" into main