Merge "Fix NPE when onDestroy called"