Merge "Revert "Set the default drawable color on a button to the same color as the text.""