Merge "Fix NPE in onDestroy"