Merge "Parcel: Avoid NPE in finalization"