Merge "Fix ColorStateListDrawable bounds handling" into qt-dev