Merge "Update default button color per design consensus"