Merge "Removed the new picker ui flag" into main