Merge change 22308 into eclair

* changes:
  Replace fullHeight support by fullSize (height and width)