Merge "Add feature detection for color scheme customization" into androidx-master-dev