Merge "Handle null argument to GradientDrawable.setColor() and setStroke()"