Merge "Updated string char-limits to better match available space for data usage." into pi-dev