Fixes: Wrong values are shown when both label and icon are overriden.
Fixes: Wrong values are shown when both label and icon are overriden.

RevBy: Jon Nordby

Elleo/framework,sil2100/maliit-framework,sil2100/maliit-framework,binlaten/framework,sil2100/maliit-framework,jpetersen/framework,jpetersen/framework,RHawkeyed/framework,sil2100/maliit-framework,Elleo/framework,RHawkeyed/framework