Merge change I097b444e into eclair

* changes:
  Fix ApiDemo Layout rendering test