Merge "SystemCertificateSource: Mitigate NPE when checking updateable certs directory" into main