Merge "Add new WiFi Calling string without hyphen" into qt-dev