Merge "Merging from qt-qpr1-sysui-dev @ build 5855545" into qt-qpr1-dev