am e13ec26e: Merge change 22135 into eclair

Merge commit 'e13ec26e6cab65831eefbd7b3c7aeee9ea714c91'

* commit 'e13ec26e6cab65831eefbd7b3c7aeee9ea714c91':
  Support full length rendering.