Merge "Update tile color from using accent to colorControlNormal."