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

Change-Id: I3a619b554a7c59d29429efe1247c4a350874397d