Merge "Not throwing NPE when can't resolve test provider" into ub-launcher3-qt-qpr1-dev