Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev