Merge "Make AndroidColorScheme easily overridable" into main