Merge "Updated ColorDrawable to implement getColorFilter"