Merge "Fix: some flagged APIs are not recorded." into main