Merge "nuplayer2: Fix two use-after-frees"