Merge "Remove width restriction on gadget labels"