Merge "Remove hardcode color in styles.xml"