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

* commit '460198180f95fc4527afc385582fa3c07bdbc067':