Merge "Replace usages of deprecated Resources.getColor() and getColorStateList()"