Merge "Fix issue that the wifi calling text cannot be customized based on sim"