Merge "Fix NPE in onDestroy() when launched without args"