am 70a7be07: am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height.

* commit '70a7be0799bd1af77c0bcf2472d9c7e46f53c3c1':
  revert I057b7ac0 now that the layouts are the expected height.