Merge "sthal: adjust priority for Oslo" into qt-qpr1-dev