Merge "Add button to trust a CA cert" into nyc-dev