Patch to avoid a crash when the app has an ExpandableListView. This AdapterView requires special support.
Keep the background color of a view when setting image to properly show the color on transparent image.
Merge remote-tracking branch 'upstream/master'

Merging with the main