Primary buttons should be blue, not grey

Recent change of color for default buttons needs to exlude primary buttons

Change-Id: Idc36c0d721e11fa4435833a610610a4ee04469df
Merge "Primary buttons should be blue, not grey"