Merge "Fix GradientDrawable compat tinting" into lmp-mr1-ub-dev