Merge "Updated support for drawing background drawable when resizing"