Merge "Cleanup: use shared apex_key" into main