Merge "Created flag for new customization picker UI" into main