Fix unusual NPE after onDestroy

Bug: 11673978
Change-Id: I4d5268312911685ff1ca9483a62442a1a9686c62
Merge "Fix unusual NPE after onDestroy" into pac-4.4