Merge change 22138 into eclair

* changes:
  Add basic support for full height rendering.