Merge "Colored button should be using inverse primary text color"