Merge "Fix NPE in onDestroy." into lmp-dev