Merge change Ifb2ab8f8 into eclair

* changes:
  Reverting the background colors back to cupcake's values.