Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."