Merge "Increase the char limit of shortcut categories" into udc-dev