Merge "Fix double auth issue" into qt-qpr1-dev