Merge "Workaround mutate() bug in GradientDrawable pre-ICS" into mnc-ub-dev