Merge "Added char limit to string" into gingerbread