Merge "Fix NullPointerException in ActivityStack"