Merge "Fix R.drawable.ic_search_24dp" into main