Merge "Pull out common code in createFromParcel's switch"