am 9b400d81: am c52a78cb: am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation

* commit '9b400d81287c5be3c3902edfad17f09e955dbc8b':
  DO NOT MERGE Fix NPE during activity recreation