Merge "Remove beta tag in new customization picker" into main