Merge "Fix issue that Wifi Calling preference is showing wrong value."