am 024b3639: Fix NPE on orientation change

* commit '024b36390fce843107b0916f0c3468e5a67a212a':
  Fix NPE on orientation change