Merge "Modify null clock handling in picker" into main