Merge "Make new, private dynamic color resources accessible from Java" into main