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

Change-Id: Ia22d4b6c54b262f2fa6ef145845dab481ee47896