Merge "Merge "Redraw legacy navigation bar paint onLayout" into qt-qpr1-dev am: 10000738 am: e9c26cad"