Merge "Fix status bar flickering" into qt-qpr1-dev