am 4e09cb9b: am 38bcf6dc: am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."

* commit '4e09cb9bf6165f68b42549772b74596ceb6198fe':
  Fix to NullPointerException on move back in ActivityStack.