Merge "Fix NPE in ActivityStack."