Merge change 25351 into eclair

* changes:
  Change Theme.Light's background back to pure white.