Merge "Align diff context colors to WikimediaUI color palette"