Merge "Fix certificate manager UI (take 2)" into main