Merge "Bug 576866 - readded custom font in LabelProvider"