TMDM-7819: Fixed the "search on" List control not show correct item after do a refresh action
Merge branch 'maintenance/5.6'