Merge "Skip redrawing the bars if the surface aspect ratio matches" into qt-dev