Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev