Label still being cut at 255 characters

This is in relation to this issue: #342722: Creating longer labels for questions

The patch that was created in the above issue works as expected, but there is still a problem. When you are adding the component label on the form components admin page and you add something over 255 characters, once you hit Add it takes you to the component settings page where it gives you a 255 character trimmed version of the label you just entered. However, the patch in the issue above allows you on this screen to add a label that's over 255 characters and everything works great, but you have to end up pasting/typing the label twice since it initially trims it.