Merge "Update display text in cert notification" into nyc-dev