Merge "Cleanup: use shared apex_key (fingerprint APEX)" into main