Merge "Save and restore PickFragment's internal state." into nyc-andromeda-dev