Merge "Manual selection item's data icon is wrong" into rvc-d1-dev