Merge "Removing contents hidden string for public notifications" into oc-dr1-dev