Merge "Fix assertion error in picker initialization." into nyc-andromeda-dev