Merge "Add APN configuration for IDC (2447)" into main