Merge "Fix edge-to-edge issue in certificate manager UI" into main