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

Change-Id: I492dbe9f669cc76e5cec2d3a0d9aef775705e8a7