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

* commit '422d7003db8d26b5fa503aa294348d7b53621db1':
  Fix to NullPointerException on move back in ActivityStack.