Merge "Correctly clear resizing drawable when nulling background." into nyc-dev