Merge "Fix bug 3207067 - adjust AbsListView content pop-in when clipToPadding=false"