Merge "176321: Add missing @ColorRes/@ColorInt annotations"