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

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