Merge "Make sure background drawable callback is cleared during resizing" into nyc-dev