Merge "Redraw legacy navigation bar paint onLayout" into qt-qpr1-dev