Merge "Add "+" in EmergencyNumber API" into qt-dev