Merge "Changes char limit for Privacy Settings string"