Merge change I67285c9a into eclair

* changes:
  Prevent NPE when doing a fillSpecific layout.