Merge "Include subid in WiFi calling intent to settings" into qt-dev