am 558f1c2a: Fix NPE in CellLayout (issue 11113502)

* commit '558f1c2ac73c3a0c3c0c316222b6b7f9c76e2501':
  Fix NPE in CellLayout (issue 11113502)