Merge "Make button text black for non-Vector buttons:"