Merge "Update content description after updating primary" into nyc-dev