Merge "Fix bug 6029592 - font size setting causes clipped icon menu items"