Merge change Ia0609a0d into eclair

* changes:
  rebase layout test result as the numbers reported are much more stable now