Merge "Set longer char limit for sync setting strings"