Merge "Clean up usage of theme colors, deprecated Resources.getColor* methods"