Merge "Text color for quiet buttons should not be lightened"