Merge "Carrier config for cross sim display format"