Merge "Fix for race in writeToParcel and unparcel"