Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev