am bfa68abc: layout test rebase, bug fix

Merge commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7' into eclair-mr2

* commit 'bfa68abc955ed1fe6cf6d98e42f344a8d623fab7':
  layout test rebase, bug fix