Merge "Never scale nine-patches in ImageDecoder" into pi-dev