Merge "Fix bug 3497341 - take list padding into account when drawing ExpandableListView indicators"