Merge "Merge "Skip redrawing the bars if the surface aspect ratio matches" into qt-dev am: 3cf66a40 am: f83de3a5" into qt-r1-dev-plus-aosp