Merge "Fix ColorStateListDrawable bounds handling" into qt-dev
am: fcbde5243a

Change-Id: I80d466677b3e092de6905364c4536dcac5c2d1f4