Merge "Fix issue that "Wi-Fi call" disappears when Wi-Fi call is on hold"