Merge "Fix race condition in GradientDrawable"